From: Kenichi Handa <handa@gnu.org>
Date: Mon, 8 Jul 2013 11:55:58 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2169^2~17^2~24^2~80
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6388fe5e472c9bcfcd89b83c5818e7544502377f;p=emacs.git

merge trunk
---

6388fe5e472c9bcfcd89b83c5818e7544502377f